ARM: thread_info: Avoid ABI change in 3.16.7-ckt3

Restore thread_info::arm_restart_block even though it's now unused.

Gbp-Pq: Topic debian
Gbp-Pq: Name arm-thread_info-fix-abi-change-in-3.16.7-ckt3.patch

diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index 76155ee5ac3b305c3a21b67c3e8c501c02621d29..4262a2be1a086082d9f9f36ecac6dba5ffee3975 100644 (file)
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -43,6 +43,17 @@ struct cpu_context_save {
        __u32   extra[2];               /* Xscale 'acc' register, etc */
 };
 
+/* bwh: Retained only for ABI compatibility */
+struct arm_restart_block {
+       union {
+               /* For user cache flushing */
+               struct {
+                       unsigned long start;
+                       unsigned long end;
+               } cache;
+       };
+};
+
 /*
  * low level task data that entry.S needs immediate access to.
  * __switch_to() assumes cpu_context follows immediately after cpu_domain.
@@ -68,6 +79,7 @@ struct thread_info {
        unsigned long           thumbee_state;  /* ThumbEE Handler Base register */
 #endif
        struct restart_block    restart_block;
+       struct arm_restart_block        arm_restart_block;
 };
 
 #define INIT_THREAD_INFO(tsk)                                          \